From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 10 Mar 2010 15:00:47 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~99
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0be6503b6b7c10a2e97f46faf36e1a239a2611a1;p=emacs.git

Merge from mainline.
---

0be6503b6b7c10a2e97f46faf36e1a239a2611a1